Add more detection for default template files, descriptive comments, add a test that works.