Fixing issues for Review 1a.
Fixing bugs in Review 1