Fixed Bug causing editing of null clip.  Issue 3044
some comments and cleanup