Refactored the way Markers are handled. Minor MPI changes.

Change-Id: I14e8d0fa3ffcc839dccb02fa72e7c953f4af3b20