making some general changes