Big set of style changes and fixes