Improved data loader and db insertions
refs #623 #620