todo & composer update