Completed Phase 3, added comments, and fixed some comments too