bringing metrics reports back online, other stale commits and small tweaks