some bugs eliminated !