Couple of cleanup changes, new Publish script