lot of fixes
22 files changed