some bug fixes

version 4.2.2 bug fixes and such