Fix incorrect qqq descriptions, improve a couple others

Change-Id: I75fa598875e5e44a8527ded807cc9f37faf4c2a2
Merge "Fix incorrect qqq descriptions, improve a couple others"