loads of little fixes, including moving to one script
need to fix readme as well