TS-1733 - Retool tsxs so that it can compile multiple source files
TS-1733 Minor fixes.