Lots of style changes, as per Iberia's suggestions