clean up tracking code
simplify offset code
Fix readme typo