fix lots bug!!!