Minor overhaul of graphics system