I included new comments. I hope you are fine with them once I pushed the new changes ;-) Thanks!