numerous changes
more changes