-Some small updates to XML state loader.