- fixes am template
some updates