Comment/Capitalization fixes