Extensive fixing of IRIs and File paths.  Clean up of commented code.