Updated patches in attachment.
Do you see something else to fix or improve?