Lots of style changes and some data additions