comments added in src/core, tests added to cover the mark zero pairings in test/core