some buggfixes