Fix various things that weren't jiving well together.

Fwiw, I hate the separation between port and host, but at the same time, it's important.  It's really really annoying
Update the version