Re: oil pump and reservoir
The fuel pump is completely mechanical; works off a pulse from one of the cylinders.
The oil side of the pump is not serviceable. You can convert to premix or buy a new pump. Converting to premix costs nothing if the gasoline side of the pump is still working.
New pumps are a dealer item, no aftermarket parts available. You will be upgrading, so be sure to get the most recent pump.