#89 updated xml generator and terminal.