fix vim colors, other small improvements