A little more cleanup and some spelling corrections
A little more cleanup