Autocomplete++, preparing for child restrictions, plus some minor things.