fix up some of the offsets, still not working...