Misc fixes, and more PSR2 work
PSR2-work