Bug fixes

>Fixed bug with one of the achievements
>Fixed certain weapon not being given at certain times