xml config
more fixes