Improved messages
Fixing autocomplete problems