faster TSsParser, additional minor edits