composer improvements; close #1638