- Explicitely cleanup X11 stuff on exit
- Fix COPYRIGHT comment style and indentation