Added Publish/Subscribe, minor changes to batch files