Bugfixes + Speed