Minor bug fixes and included new templates.