Fixed resources bug and improved weapon