fix pathing
Build XML file
fix caching, code cleanup