minor adjustments/wp c/o to 3.7.1