Beer xml

Several fixes and tests added.

Efficiency and volume fixes.
Add some equals methods.
Merge with the latest from master.
Various Fixes.