Add Average Weighted Time view, plus a couple of bug fixes