some general changes