further improvements on the intro along the lines suggested by P