Minor improvements

Added support for custom domain names and port numbers