some small tweaks (needs script update again)