fixed coloring and things