Updated some minor things.
Manual merge.
fixed
Fixed