colors and some misc code cleanup