Add more missing entries and fix more mistakes (some of which I introduced