Added in other keymaps and improved path finding