Added Listener and GraphicalViewer. Minor changes.