* Some cleanup, change to ggplot2 for graphics