Fixes for various small data errors

Tweaking loading script to make it easier to apply small updates