Fixing bugs srt

Fixed some bugs found with the newest run through of the test plan.