Fixing offsets

trying to get this better