Added --protocol and made some batch-file improvements.