Alpha 10.7

More bugfixes. And I don't remember what else I did.