Duh. And a few fixes.