Some updates and cleanup.