changing some things
fixed errors with xml