Several updates for testing and fixing bugs in the file pathing: