cleanup and fixes
3 files changed