Updated offsets for latest patch
Several changes