rewrote xml parsing.  cleaned up some code. RC1