many fixes & new colors