small mods on few scripts