fixes to cauldron code