Updated to work with variables in batch file and updates to xmls.