some fixes and improvements for the start-wizard