fix many bug on version 2.0 alpha