Massive updates all around

Lots of style and functional changes