some more corrections by cordoval