Sorry, if all awful. I will try to release a fixpatch on demo. And if people don't like it, then alas...
