Some more fixes; one graphic xkcd.