Minor bugfixes + Insert mode mappings