Cleaned up composite.py a little.  Some comments on things to do as well.