Gohma script corrections. Fix #1