Committed recent changes before breaking

About to reimplement old method of buffering data
Remedied a few longstanding errors

Accidental error in if statement lead to over 6 months of data
repeatedly being out of alignment.
Changes to reduce misalignments

Returned to use of total bytes read and offset start to buffer for when
we return