lots of style changes and other stuff