updating AETemplates & minor bug fixes