minor updates to get ll working with subcomposit directories. still buggy