Removed old files yo
Fixed performance calculations and stupid shit
Merge branch 'master' into windows