more fugitive mappings, clean up comments