Updated the structure and did some fixes.
Added the xterm notes.