Fixed options handling bugs. Moved 1st software upgrade to wizard.