fix some small things
Merge remote-tracking branch 'newOrigin/master'