add state color, other changes based on prototype review