Some modification

fix bug 49641687, finished story 50580821, 50580895.