fixed minor things after Milestone 1 (testing doesn't work properly still)