small buggfixes