Improve descriptions and labels