updating with new template plist and working script, fixing header includes