fixed collision detection and worked a little more on level editor