some bugfixed