Added level and levelobjects, updated display, various cleanup