bug and level fixes