Added random and script scorers
Fixed analyzer defs