Further adjustments to Chartbeat implementation.