other composer fixes, almost working