Fixed some pointer arithmetic. Still getting mem mismatch and seg fault on 1.trace, but make has no errors or warnings.