Modifications to Counter storage.

Counters are now stored in a dictionary, to better accomodate different
experimental designs.