Take 2.  Cleanup some, add some.