fixed offsets some more