Bug fixes

* Clean up temporary files
* Added missing help for a few parameters