Ninja update, Several nerfs and tweaks
Merge pull request #3086 from Mordeth221/patch-3

Ninja update, Several nerfs and tweaks