Misc script updates