Some more performance testing and code refactoring.
Some renaming