Added completion-map-case, and comments