Restructured TS map computation

As close to final as it could get today.
Same thing ... remove default `(500, 9400)`