Bug fixes & colours