fixes
psr4 and fixes