changes to mapcube.py
fixed minor conflicts