Record start time properly
Merge branch 'files' into address

Conflicts:
	src/js/form.js
Add a clarifying comment
Fix typos from the conflict resolution