Point 2 is already implemented ;) Chances for pistol and shotgun increased, sword, rocket launcher and grenade lower ;)