AutoComplete comment fixes and error style fixes