better keywords; CLI