Debugging corrections, removed some TODO comments, consuming shadow packets.