Updating AUTOCOMPLETE with comments and some implementation