added last fixes to mapper