Small cli changes
Some bugfixing for CLI