Don't deconstruct options with constructor.

Less changes for added options.
Puzzle type can now be overriden with command line flag.