more fixes and COLORZ