fixed control bugs