Coding fixes and split out check command

Also makes the freeze called with select if needed.

Ensures again all the tests pass.