more commands/consistency fixes pre-testing