Partial correction pass on command comments as per #42