More 637 - misc updates