few buggfixes