fixing up javascript
fixed maps
merge conflicts