Incorporates Walter's suggestions, a complete origin.xml, and redefinitions of ARP...