Fix variables and add completer functions