ch07 struct fixes
ch07 struct fixes