Yay, those seem like some good changes!
But what if you have no ammo left? Will you get a melee weapon, will you be helpless until you find more ammo or will you just switch guns? I would like the second one ;)