Please don't submit any patches upstream yet!
I want to fix some more bugs first.