Comments tweakings :-)