lots of updates to styles and such