fixed merge conflict
added proper session cleanup
made tmx status lighter