some fixes + level 3