Changed default controller and some cleaning in DEBUG statements