bugfixes (speed)