Mike post beta review3

@tcatapano Lot's of commits tonight.  Most are cleaning up redundancies, but also consolidated some attribute definitions, etc.