Puzzle2 improvements.