Use ggplot for plots
minor fix to demo file