A few tweaks and last steps.