Revert "Revert "corrections + temp error consumable""

This reverts commit ffc19fba79f42ac9d267642af610be626884375f.