Cleanup
Add further cli options and improve descriptions
Fix duplicate cli options names; Make tmp dir configurable