minor equivalent refinements (without solving the unmapped read/write bug)