misc changes
fixed 'no mapping' error