more cleanup, fixed typos
more clean up, fixed some more typos ... progress and such