More scripts and fixes...