add a number of fixes reported that we need here
11 files changed