Typos and psr-0 fix