Tweaked a lot of the loading functionality.  Still debugging the loading and saving for the native format.  Some other minor changes.