minor edits and templates