Some Scripts, minor changes