fixed some issues with comments