More updates and cleanup.