Script tweaks so everything shares args, everything goes where I want