fix some script issues
Merge branch 'dev' into gemtalk