baseline work for ES environment diff hotkey stuff, code cleanup.