More cleanup and updates.