Plugging along; a lot of cleanups