Small update, and add other xml files to play with.