Script formats improvements & fixes (#117)* Script formats improvements & fixes* Naming (commit: df39140)