Successful fix of autocomplete, tidy up mode inits