Puzzle changes. Fixes issue #13, replaces 402333c.