Aded '--graphical' option; minor improvements