added port chooser to wizard and other small changes
Merge