Fix data loading
Update plotting