Do better job at updating wizard pages on changing options. Some refactorings
Various clean-ups