Fix issues with piping packets
Fix moar socket issues
Merge branch 'working'