I agree that could be improved! The extra Vim keys you suggested should be simple enough to add.