Minor fixes
Various changes
Various vim changes