cleanup and fixes
4 files changed