fixed bugs. chapt 2 complete