buggfixed some stuff