a few tweaks triggered by tgs's comments
a few tweaks triggered by tgs's comments

DELTA=46  (25 added, 1 deleted, 20 changed)
OCL=24342
CL=24354
abustany/go,abustany/go,abustany/go,abustany/go,abustany/go,abustany/go,abustany/go