Several Minor changes.