revusky Various minor changes to synch up.