some bugs fixed part2