Complete command suggestions3

Supersedes #280