Further updates

Now correctly builds ammo possibilities.