fixed psr-2

a couple of psr-2 fixes ;)