fixed problems with comments