Fixed some bugs, added Gun and Torch