Use correct size of packets and some more fixes

Obviously there were some mistakes in the previous
commit. Fix them and also remove some sysouts.