fixed data loading
small fixes