Second Commit

The latest changes, before I leave the VideoRay.  There shouldn't be
many differences, but just incase.