Added extra fields to position map and amended comments