Added organisations script and small changes