Small changes.

Going to merge branches.