some style upgrades