Fixed a bunch od bugs, added another level; minor cleanups here and there