bug fixes

version number 2.2
fixes