final template and token edits for v3 of study