Various script updates