Better level.

@samtcmu  Updated a level.  Also submitted a bunch of stuff to trunk without a pull request, sorry.