Fix offset bugs
script tweaks