Update locals, remove cauldron uncoloring, some other tweaks