Version 1.1.1

* Adress some general issues
* Improve clean up script