Reworking Tours based on a large number of errors detected by typescript compiler