[Feature] many improvements [WiP] cli, refactoring, timeouts, ...