changes to make tool 11 work better
Misc fixes