Some clean-up, some additions