Commit things before I merge to GH
Minor style changes and conflict fixes