Lots of fixes all around, prettied up some stuff.