Pretty colours
minor fixes