Scott

Mostly style updates and changes from master.