fixes and color update