Final tweaks and cleanup.