Cleanups.  Going to publish now.