Tons of fixes and style upgrades