Lots of hole patching

<< ^^ >>

<< ^^ >>