lots of little changes
re-re-refactoring

rearranging things and correcting speling mistakes.