improve cli
fixed https timeout
pep fixes