Cleaning up, adding new material.