Minor updates
Massive update to agent template file to fix issues with incorrect values being set