xml: fixed spelling
src: clean up after shraring
src: some refractoring