Added Forrest's upgrades to the config file and file parser