further tweaks - data, schedule, metrics