Improve comments and sample puzzles