Some fixes and add about composer part