Merge pull request #1407 from ZappoMan/bugfixes

fix expectedBytes() mismatch between edit packets and normal packets
revert back to timestamps, fix a couple other bugs