fix cli
working
merged