Some refactoring, introduce a draft of “solved?”, Add some more sample puzzles