Bug correction and tunning the controller.