Completed all fixes for chapter 6 (file chpt7)