Add more output.
Fix environments.