remove "abstract;;" from *.xml. Some fixes.