minor fixes, psr2