Update CLI
Fix monitor