Misc updates to track lapping/lapped ahead/behind