some cleanup, added more leader keymappings