various little bug fixes
8 files changed