added client port, some fixes regarding that and trying to be more consistent