Setup.py and cli enhacements