Th: testing, minor changes