[@The Mad Hatter]
Alright, I believe that I've fixed up most of it.  Tell me if it's okay or if it needs more changing up, please.