fix PSR-3 link as mentioned by @max-voloshin
fix class roles
code fixes as mentioned by @dirkluijk