More improvements to doctor show