misc fixes and whitespace cleanup
didn't mean to add this junk