Added scatterplot, fixed some minor bugs