minor fixes
improve scripts