More cleanup, some additions.