fixes in scripts and cpp