removed 'ts' and some other small fixes