Code review updates

These are most of the changes as discussed in the code review.  I still need to change the group behavior and figure out what to do about the XMLModule store.