oneOf support; various bugfixes