small fixes; dependencies can now be matched in any order