+ some bugfixes in tnr