merges from THLG
fix typo
again
mext fix