General bugfixes + git keymappings