TESTRUN Addressed review concerns and fixed a couple of bugs.