Some script updates from the "mother" project