Numerous improvements, graphical stuff