some fixes
fix some typos in xml
Merged tschanzt material patch into master
Replaced some magic numbers with speaking constants.
Merged englercj typo fixes into the master branch