Merge pull request #308 from Alexpux/develop

Work on removing duplicate scripts. Some other fixes.