I think that a float switch is going to alleviate most of my problems with the bubbling oil. I found this switch, which shouldn't be too difficult to add to the sight tube. I'll look for other options (manufactures) as well. http://tinyurl.com/MeggitFueling