added weighted total to reviews
fixed merge conflicts