Fix top-level stats
Cleanup. Almost there.