Small edits

Removed while-loop, and some other edits. Still problem with
non-unique-solution puzzles.