Update to how comments look, mode changes