Marc mappings final

There's a more or less unrelated bug fix in here as well - see the first commit.