Added Location and LocationLevel's.  Fixed several elements that were
showing up as attributes to show up properly as elements.