More Vim mappings, small fixes