Hotword additions and some organizing