* fixes
* cleanups
6 files changed