a few tweaks before gr8 conf.