fixup and optimize edge conditions of composite; updated property handling of produce...