- Little clean up
- better error output