Add some more info; fix some stuff.