Don't focus on performace anymore. Gotta get the gameplay rolling
Some minor adjustments