minor changes

Modified a few files in preparation for Iteration 3