Adding bar chart, fixed several bugs, cleaned up data