Sorry for the delay, (damn greek summer temperatures)

here is the updated patch.

I added explanations to all the patches as you told me, so to be
better understood why I did what I did.

Thanks,
Manolis