Fix comment bugs, UI