reverted timescales back to descend from quantitive scales (so they will play will with domainers for now)
changed timeAxis to match changes in baseAxis