Packet streams complete

Small changes to Client and Server also just in the switches
Revert "Packet streams complete"

This reverts commit 6c36dac7d9b0120960eb21c6da19861a694848b9.