fixed some issues in controllers