fix offset script and more logging
Merge remote-tracking branch 'origin/master'
updated test data