minor edits, moving opts to a template value