fix small problems with earlier commit: add back earlier commits reverted by this...