bugs and colour changed/fixed