changed to new data format; plotting bugfix