Stuff and fixing.
Merged, fixed timestamping and cached packets.