Add averages to some indicators
Add code to plot averages as gold bars
Improved code for plotting averages, add more averages to indicators