Refactored creation of default data alleles

Should be clearer now.  Also fixed a couple of bugs.