Few level fixes and submitted