Monitor auto-discovery + more commands & improvements