added weapon hierarchy, modified char hierarchy