Some more script updates