Remove some debug comments, fix a typo in the default template