Minor tweaks and fixes to many style stuff!