small bugfixed, speed tests