[WIP] more fixes to no-sims scripts