Add new way to go into normal mode, clean up comments