xml things
style fixes