color changes and minor markup tweaks