Plots

Here some code is shuffled around; will merge into dev branch.