New Scripts, bug fixes