Complete command suggestions2

Supersedes #279