cleaned up the mapdata code and possibly fixed covert ops bug, refs #681