Few minor fixes and color update