Merge pull request #31 from brain-murphy/elizabeth

more arrow fixes
a few changes to xml files
merged and fixed some stuff.
Merge pull request #32 from brain-murphy/brian

merged and bugs
fix conflicts