several unrelated changes