pull from master; color tweaks