- cleanup
- fixed logging