More Ninja Tweaks