Fixed bugs in commenting