Minor fixes, PSR2 and docs.