Doc fixes and PSR-2