TCP port can be configured
Small usability tweaks