Added pathogen and fixes to allow auto completion