some further facelifting