Updated signatures, offsets still need updating
Merge branch 'master' into sm160