fix comment bugs