Updated composer and some bug fixing