fixes + colors