small improv. here and there, colors are still fucked