Minor bug fixes; remove chart.