Enhancements. Changing the reported plugin name, and including the port in the hostname