Make client able to connect with correct IP & port #
Minor changes
Minor changes, no functionality changed...