Substantial graphical improvements