Finetuning.

Adjustments to make vim work smoother.