Fixed colour bugs and other bugs