more refactor.
Minor tweaks. Commmand line access and wizard is working now.