Script running rework; cleanups