OrderComponents added to their orders basic/secondaryComponentsList as soon as they are created. Other minor corrections