Fixing comment bugs