Added XML, made small fixes