some bigfixes