merge dougs updated tracks into xml.  need to check i didnt make typos