fixed lag/offset issues