fix many bug
littel change