Integrate some more sources; small improvements.