Fixing my end

Outdated
More Fixing
Even More Fixing
Even More Fixing
Almost done fixing
Final Fix
Merge remote-tracking branch 'origin/master'