adding in the offsets and a few other small things