More point-pulling and minor corrections.