tidied code and chopped the cruft
cleaned house
major refactor (halloween clean)