comments, refactoring for cleanliness, other stuff.