comment and shitespace updates