Minor mofications

Changed some minor points, primarily to allow the handling of mapping
files with carriage returns by creating a “cleaned” version.