Composer update, fixed more order/materials bugs