fixed 2 findbugs, restored some classes without the wrong comments