many unrelated changes :-/