first version of disambiguation tool
bug fixes in CLI