[ADD]ed CLI interface and some changes
[ADD] minor changes