Documentation fix
TMX format fix
Merge