simplify mapKeys and add mapEntries