Weapon and Monster changed, fixed minor bug