add test-kitchen, fix more late-night blunders