Hybrid network fixes

This is going to have several fixes to help ease us into our hybrid network.

- '-p <port_number>' is being ignored right now. First commit fixes it.
merging (I'll rebase and fix any conflicts on my PR later)