Added timescale, ring labels; refactored decay