More Fixes + Performance Increases

To many things to describe, just look at changed files lol.