cleaned up mapper.js
merge