Some improvements
Serious graphical improvements.