Make close button work.  Make assertionerrors a little nicer