minor fixes

bug still in calc 1/2 lvl