Minor fixes, cli version added