Better control to detect bad command use

A more human readable bad use detection...