Minor corretions on the basic controller