jpd -- maybe finished corrections