Andrea, I think I have caught up with you now.  So far have done the same as recommended by Andrew):

1) move patch2 (for now)

2) delete patch4 (not needed anymore)

3) added ONLY the patch from Andrew as listed below (if you have trouble with this, I can send the 2 whole files instead).