fixed various mapping errors