More comments. Fixed use of templates