jpd -- more corrections done