Some style stuff and fixes