color and other minor updates
Merge branch 'update'