Fix data loading, ...stuff