CM: tons of vim changes