Add some of my stuff; xterm; rename.