added person stuff back in for auditor aware and fixed bugs with templates