Change to more intuitive dplyr syntax; update graphs