Final corrections to the enrollment declaration templates. These are now tested and functional.