Bug fixes, graphical improvements