model fixes, composer added