update to PSR-4 and some small fixes