check command + various tweaks