fix xdefaults and other changes.