Fixes on Part 1 after feedback from reader