step 6.0 - composer update & better general behaviour