templates notes and bug fix