Cleared up some multiple url support / batching