change colours, misc. fixes