Add comments
Fix comments
Fix comments
Merge branch 'TimeFacetCleanup' into develop