WHW4: Some Minor Changes.