Code style.
Various wizard tweaks.
Fixes #42. Fixes #38. Fixes #36.