#1491 done several updates.