track changes: use markers instead of margintext
* makes for a cleaner (and more performant) code