Added composer.json + fixes