Some improvements, mainly graphical
Some improvements, mainly graphical