Add some review comments

Did some review with berdir. Added some sommets for later considerations.