Bugfixes, still working on fixing

-  Need to fix basic_snapshot_data loader