note command deprecation in short descriptions, uniformity tweaks