minor
numerous changes
minor