fix composer.json
fix Makefile