Fix issue #161, move scatterplots out of WIP