lots of work to averages etc, appears to be working better now