fix bug, optimize performance and set estable