various fixes
9 files changed