Medium-priority analytics improvements

[micahalcorn]

P2s from https://docs.google.com/document/d/1qDQ6Tope1UXZjCxX-L5-_nbTpl_H_IVvKDPnBY4Vh30/edit# ✌🏼