Should be calculated from discovery in the future. Also improve descriptions on the affected commands.