add Nothing to env
fix check/where updates, and whitespace