Bugs for Iteration 4 fixed