Major speed improvement.
Remove another speed bug.