Work on data loader and other fixes.