Many (er) and (ne) consistency changes. Much work done to 19wb.xml