various bug fixes
12 files changed