hooray fixing more offsets