Fixed a duplication bug
Some performance optimizations (more to come)