Patch 1.8.5

[h2]click here for patch notes!!![/h2]
Just a quick bugfix and small balance update to tackle some of the bigger, more obvious problems before the big tournament