unofficial 2.1General

I have a Droid Eris with Verizon. I was anxious to get Navigator so Following directions from this site I did the unofficial upgrade. I'm not sure if i have received any other updates since then. When I updated I lost an app I really liked, Calorie Counter by Fat secret. It is not available in Market place and now I read that it's because I did the unofficial update. Now i read that there is a 2.2 update.
My questions : Is my phone getting the "official"updates now?
How do I get my phone to recognize all apps in market place?

I have tried to read these forums but I don't understand all the terms so i really need instructions dumbed down. I do understand basic computer and phone commands.
Currently my phone is running
Firmware version 2.1
Baseband version 2.41.0402.02
Kernel Version 2.6.29-564a4a15
htc-kernel@and18-2 #1
Build number
2.26.6305.4 CL140744 release-keys
Software number 2.26.605.4