Minor tString changes, listing future TODOs