Finishing up xml stuff