More revisions regarding Dirk's markup concerns and minor corrections