Minor corrections to text strings and first-run logic.
Refactor code.
Add time profiling code.