More refinement of cleanup tools. Reverted some of the unicode stuff because it was breaking name distinctions.
Updates to include filename in reader overlay, updated reader files.