Libs updated
Better CLI