more futzing with the colors
cleanup
fix up more mock functionality