various fixes and enhancements to support the new campaign goals