small changes and vimdiff coloring