Small changes in roundtrip and make sh take opts
Hopefully fix the double offset bug (#1 on github)