Updated with vim settings and additional bits