Updating data plots for programmatic generation and couple make file fixes.