Hitbox fixes and another stab at making reconnecting work

The Hitbox code was all outta whack because I'm dumb but now it's not.