keyword speed up + bugfixes