cleanup and some fixes
13 files changed