partial blaze upgrade
blaze upgrades + minor styling tweaks
Merge remote-tracking branch 'upstream/master'