Added Averages

And other things