Updated ggplot2 plot and first attempt at handling NAs.