more adjustment of scripts