minor changes to comments, templates