color changes and small clean-ups

commit to save progress before refactor