Changes from project
Mini style fix
Some morechanges
merge
First pass of Michl fix
Tons of commas removed and added elsewhere.