fixes and composer update