added more OIDs to template values
added changes by Ken as v2
des
cleanup and refresh from source