small fixes and the start of new controller