clean to scripts and extra fixes