fix some bugs CR:GA