fix to document new structure and add comments