[!} Many clean ups to accurate TMEM