New partnership variable; new fixes and new errors.