more fixes
29 files changed