#90 ready to be tested

I've cleaned a little bit the code of weapon info so it will be easy to
understand. Also I've started with the second priority issue.