fixed stupid STUPID bugs in parsing packets
did some stuff
the merges