some bug fixeds on controllers