4/26 fix bugs. fix check22 bugs