add fixes
17 files changed