More scripts and fixes