more offset bug fixes