Work on rendering sphere
Merged changes.
Another set of merges.