KUBOOM: bug fixes

bug fixes