Renamed series.data to series.values, rearranged some stuff