merge the rest of the comments from andreas in sections 2-3.2