finished template corrections

very close to beta test