Data/Graphing improvements.