adding colours, cleaning up things