Fixed a bit of offset problems!