Refactured a lot of the code. And more important, changed all the enumerators so they make use of the data structure. Interesting fun fact: Gained 2fps with this ;).