fixed some problems in commenting