version bump
fix comments
minor cleanup