Minor edits post-testing.