Should resolve issue #63 and possibly issue #14.
Addressing potential issues and adding functionality to batch script.