Merge branch Mario/less_stats (S merge request)

Consolidates a few of the networked stats to free up some slots. Also removes an old special command feature that never worked.