Fixed mem leak + graph visual adjustemnts