various changes, vim whitespace hi fix