artifice changes, other fixes