I spent the day thrashing on the engine again. It is coming along nicely. Here are the updates. I pulled the fuel pump and the fuel pump base off to reseal it. I always had oil leaking from there so I figured now was the time to reseal it. VW uses paper gaskets on a lot of their parts and I'm not sure why. Anyways I use gasgacinch on all the paper gaskets. Here is the lower gasket before I installed the base of the fuel pump. I forgot to get a picture of the base of the pump but it is made of some kind of phenolic/plastic and it breaks really easy. Be careful when you remove it from your engine because they swell up and a lot of them will come out in a few pieces because of that. It's not the end of the world if it breaks, just make sure you remove all the pieces from your block. They are still available to buy. I got lucky and mine removed with a little persuasion.