Merging more of Walt's changes