fix a bunch of issues with exercise 10