Add comments and remap esc