some more bigfixes.