new stuffs
cleanup and color changes