Finish the merge with some minor changes

Stupid github app on windows , can not merge properly =='