many fixes in controllers