fixups to allow for single hint command