better labels for pie chart, bug fixes.