some bugs fixed !