some bug fixes
28 files changed