change composer, bugfixes, see #1