Adds doctor command and improve listing