many coloring changes and enhancements