Weapon pickup code now takes into account number of hands. Also did a little cleanup