plotting more or less complete. Closes #30