last changes to structure and comments