Some kind of merge, plus minor changes