bugfixed some stuff