Almost finished 03-ggplot, tweaks to others