removed some commented out code, and extra whitespace
fixed several tests (and src code) to make sure everything is passing