made numerous changes