spelling errors

rearanged a few things in the script fixed a few spelling errors more
clean up and more TODOs