Added updates for surface mapper to do two x,y images instead of composite, minor bugfixes