Add mappings to move lines up/down. Other minor changes