minor fixes
mapping correction