misc changes in order this branch to work out of the box