new composer.json + small fixes