Fixed mistakes pointed out by readers on parts 1 and 2