fix several known bugs
29 files changed