remove xml and spelling
#6 - support change of origin