Add blue circles on cpi plots
Fix bug in labels
Tweak caption
Rewrite makefile to use cpi files.